Fix APD-494 part 1
Fix APD-494 part 2
Fix APD-494 part 3
Fix APD-494 part 3: javascript:void(0) subtitute with e.preventDefault()
Merge branch 'APD-494_mse' into develop