changing the script enqueueing [touch:142]
Merge branch 'refs/heads/development' into BUG-142-Improper_script_enqueueing